From: Joakim Verona <joakim@verona.se>
Date: Sat, 3 Apr 2010 20:21:58 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~3573^2~56
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=245e223a57ac14d168702891f6efbe0eb11b0384;p=emacs.git

merge from trunk
---

245e223a57ac14d168702891f6efbe0eb11b0384